From 6199656afbd387a41e6aea1d7f4b66b8f5ba63b0 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Mon, 23 Aug 2021 18:29:09 +0100 Subject: [PATCH] disable-java-in-odk-build-examples-on-zero-vm Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff --- config_host.mk.in | 1 + configure.ac | Bin 514843 -> 515152 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index a17e1eb6a2b..98312d7c4d9 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -320,6 +320,7 @@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVAIFLAGS_FOR_BUILD=@JAVAIFLAGS_FOR_BUILD@ export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@ export JAVAINTERPRETER=@JAVAINTERPRETER@ +export JAVA_HAS_ZERO_VM=@JAVA_HAS_ZERO_VM@ export JAVA_HOME=@JAVA_HOME@ export JAVA_HOME_FOR_BUILD=@JAVA_HOME_FOR_BUILD@ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@ diff --git a/configure.ac b/configure.ac index dc0100efb6c5cf5ec2731d67b4e86e8d8c627a16..67be0ccac25357b1cd3f3815e50705f1085799c7 100644 GIT binary patch delta 219 zcmbQeP5#0T`Gyw87N!>FEi9LFr*AyTA~*fOW@b(^FUK%PPrne?pnxD(AgPd9tWa8< znU}6ml98$qm0Faq5at`J$)$h&Uau)7sLF^*a10FN7PhMce vzWr}5OE}~7nqp>7evq4x44Hl~pDlE{e<}-G`3+4Hjj*YHR_ delta 61 zcmcbxLw@!)`Gyw87N!>FEi9LFrw6sLiA;~*!p^^4AfF|UaeC(`)}ZMNN?5qspBAtH PF)I+WZGT$8o}CQ<@tzp4 diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 0d5fca58d2c..6bbe1e826e3 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -59,10 +59,14 @@ $(eval $(call gb_Module_add_check_targets,odk,\ ifneq ($(filter $(OS),LINUX MACOSX),) $(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ CustomTarget_build-examples \ +)) +ifneq ($(JAVA_HAS_ZERO_VM),y) +$(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ $(if $(ENABLE_JAVA),\ CustomTarget_build-examples_java \ ) \ )) endif +endif # vim: set noet sw=4 ts=4: -- 2.30.2